Revision: bazaar--merge--1.1--patch-3
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Dec 10 03:55:59 EST 2004
Standard-date: 2004-12-09 16:55:59 GMT
Modified-files: libarch/apply-changeset.c
    tests/test-star-merge.sh
New-patches: robert.collins@canonical.com--general/bazaar--merge--1.1--patch-3
Summary: fix up star-merge three way conflict detection
Keywords: 

